Fix cursor when dragging a window over its current workspace

When we are dragging a window over its current workspace or workspace
thumbnail, we show show "no drop possible" feedback instead
of "move here" feedback.

https://bugzilla.gnome.org/show_bug.cgi?id=642329

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 83bd9146a066672e678718794e43400bd5c1fad5..074ba5a91396082c3055715c2bfe50ab7916b95a 100644 (file)
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1297,7 +1297,7 @@ Workspace.prototype = {
 
     // Draggable target interface
     handleDragOver : function(source, actor, x, y, time) {
-        if (source instanceof WindowClone)
+        if (source.realWindow && !this._isMyWindow(source.realWindow))
             return DND.DragMotionResult.MOVE_DROP;
         if (source.shellWorkspaceLaunch)
             return DND.DragMotionResult.COPY_DROP;

diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index ab9ea9091d1920f0603cf92e3984e5ff75a09f83..06dec6f6d6f4fe67f5c473f9a567e5f41ca8207b 100644 (file)
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -343,7 +343,7 @@ WorkspaceThumbnail.prototype = {
         if (this.state > ThumbnailState.NORMAL)
             return DND.DragMotionResult.CONTINUE;
 
-        if (source.realWindow)
+        if (source.realWindow && !this._isMyWindow(source.realWindow))
             return DND.DragMotionResult.MOVE_DROP;
         if (source.shellWorkspaceLaunch)
             return DND.DragMotionResult.COPY_DROP;